tree model sort: Fix compiler warnings
authorMatthias Clasen <mclasen@redhat.com>
Sun, 31 May 2015 01:29:21 +0000 (21:29 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 2 Jun 2015 13:08:16 +0000 (09:08 -0400)
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.

gtk/gtktreemodelsort.c

index 2a7de1e4346e5b96989575b09db07de132aac5a2..6cef856463e0134bc898affafaa1f216d0387fad 100644 (file)
@@ -1092,12 +1092,11 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
                                    gint         *new_order,
                                    gpointer      data)
 {
-  SortElt *elt;
   SortLevel *level;
   GtkTreeIter iter;
+  GtkTreePath *path;
   gint *tmp_array;
   int i, length;
-  GtkTreePath *path;
   GSequenceIter *siter, *end_siter;
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
@@ -1113,6 +1112,8 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
     }
   else
     {
+      SortElt *elt;
+
       path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
       if (path == NULL)
        return;